[bugs:#408] fix
Merge pull request #85 from vomikan/master

[bugs:#408] fix