Checking in dev changes.
Merge pull request #1 from jakimfett/master

Checking in dev changes.