Merge pull request #7 from wpbasti/master

Minor changes
Merge remote-tracking branch 'upstream/master'