Merge pull request #8 from myrle-krantz/develop