Make sure merge works
Merge pull request #6 from rylev/merge

Make sure merge works