Merge pull request #108 from theponti/master

Merge from master