Merge pull request #3 from log2/master

Bugfixes
Merge pull request #4 from aparapi/master

Merge pull request #3 from log2/master