Merge pull request #9 from baslr/master

pull from remote
Merge pull request #10 from baslr/master

remote pull
Merge pull request #11 from baslr/master

remote pull
Merge pull request #8 from majuss/master

d