Merge pull request #6 from petercunning/master

updates