Merge pull request #10 from JohnMai/master

Getting latest version
Merge pull request #39 from mentatzoe/master

Merge pull request #10 from JohnMai/master