171: Bugfix
169 again!
Merge pull request #5 from subzey/bugfix

171: Bugfix