Resolves #57 Issue.
Merge pull request #81 from ddimitriou/master

Resolves #57 Issue.