fixing #16 (more)
Merge pull request #17 from pschrammel/master

fixing #16 (more)