Merge pull request #67 from cassiemoy/master

Actually merge everything.