Merge pull request #3 from candaya/master

Merge pull request #1 from IanJRigg/master
Merge pull request #7 from IanJRigg/iantest

Iantest
Merge pull request #3 from IanJRigg/master

another test @834
Merge pull request #8 from candaya/IanJRigg-master

Merge pull request #3 from IanJRigg/master
Merge branch 'IanJRigg-master'