#334 fixed
Merge pull request #414 from svarovski/master

#414: pull request #334 fixed