Merge pull request #1 from jed204/master

sync