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

This reverts commit 8f918620faedaf1cc434ed6bfe445271d8583e7d.
Merge pull request #6 from borski/master

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