Merge pull request #215 from theponti/master

Merge from master