Merge pull request #3 from hanskhe/master

Pullpull