Merge pull request #4 from myrle-krantz/develop