Merge pull request #1 from tannwestlake/master

Oops, let's put it back into dev