first commit
Merge pull request #9 from trs-neilross/develop_neil3

commit