Merge pull request #2 from myrle-krantz/develop