Merging pull request #78, thanks @ilyakava!