Merge pull request #101 from nsikkila/master

korjattu Booginan löytämä bugi :P
Merge remote-tracking branch 'upstream/devel'