Merge pull request #62 from vikinghug/master

Getting up to speed