Merge pull request #8 from baslr/master

pull from remote
Merge pull request #7 from majuss/master

Merge pull request #8 from baslr/master