Merge pull request #1 from tannwestlake/master

Oops, let's put it back into dev
Merge pull request #2 from tannwestlake/dev

Merge pull request #1 from tannwestlake/master