Implementation of #56.
Merge pull request #59 from statschner/hotfix/1.0.1

Implementation of #56.