Merge branch 'Armour-master'
finish!
all is well
Merge pull request #5 from lbenzene/master

merge from origin~