Closes #57

I've created pull request from issue 57.