Merge pull request #3 from AndySomogyi/master

Pulling things from develop to master