Merge pull request #16 from qtamaki/master

bugfix