Revert "#25"
Merge pull request #61 from backbee/revert-60-25

Revert "#25"