finished ~~~
Merge pull request #5 from lbenzene/master

merge from origin~
Merge branch 'Armour-master'