Merge pull request #10 from myrle-krantz/develop