Merge pull request #16 from Cueie/master

merge pull request #16
bugfix PR16

bugfix PR 16
bugfix 2 PR16

second bugfix for PR16
Merge remote-tracking branch 'upstream/master'