Merge pull request #1 from greenlaw110/master

Sync with greenlaw110