first commit
Merge pull request #12 from trs-neilross/develop_neil2

first commit