Merge pull request #21 from vikinghug/test-180

Test 180
Merge pull request #22 from vikinghug/master

Getting up to speed