Merge pull request #3 from petercunning/master

updates