Merge pull request #2 from rfrank/develop

resync Develop