Merge pull request #12 from mwild1/develop