Merge pull request #49 from vikinghug/test-170

Test 170
Merge pull request #53 from vikinghug/test-180

Test 180
Merge pull request #54 from vikinghug/master

Getting up to speed