carlganz Merge pull request #4 from jacobkap/master