A couple updating

Nothing major just updating out of date code
Merge pull request #82 from lexware/patch-1

A couple updating