Merge pull request #3 from myrle-krantz/develop