Merge pull request #282 from theponti/master

Merge with master