Merge pull request #6 from myrle-krantz/develop