Implement #21
Merge pull request #27 from Trevoke/dev

Implement #21