Merge pull request #56 from TheCount/develop

Some houskeeping