Merge pull request #39 from vikinghug/test-180

Test 180
Merge pull request #40 from vikinghug/master

Getting up to speed
Merge remote-tracking branch 'upstream/development'