Merge pull request #95 from tonyrd/master

added all previous updates since latest upstream