Merge pull request #6 from tc28/master

merge