Merge pull request #107 from blueghostuk/master

merge from master