Merge pull request #3 from travisneilson/master

Master