Merge pull 4

Sending myself a pull request so I can make inline comments