Merge pull request #5 from myrle-krantz/develop