Merge pull request #8 from rtsuk/master

pulling master down to fork