#155 fixes after review
Merge pull request #205 from krzyk/155

155