Revert "Revert "Merge pull request #4 from greenrd/master""

This reverts commit a865a8d5c4b2e20081e7c9e8a6c3ad23a975f29e.