#407 fixed
Merge pull request #419 from krzyk/407

#419: pull request #407 fixed