Merge pull request #11 from myrle-krantz/develop