Merge pull request #14 from mentatzoe/master

Test
try to fix bugs after merge

try to fix bugs after merge
Merge pull request #2 from JohnMai/master

Update from John's fix