Merge pull request #1 from tomchristie/master

sync