Merge pull request #104 from andypelzer/develop

Housekeeping