Revert "Issue19"
Merge pull request #28 from vortispy/revert-24-issue19

Revert "Issue19"