Merge pull request #3 from myrle-krantz/develop

merging 2 changesets which were missed in the original migration to apache