Merge pull request #7 from myrle-krantz/develop