Merge pull request #1 from rtsuk/master

resyncing master down to fork