issue 508 fixed
Merge pull request #522 from svarovski/issue-508

#522: pull request issue 508 fixed