Merge pull request #203 from adamarla/master

Feedback for kaagaz
bug in prev commit