Merge pull request #16 from myrle-krantz/develop