commit
Merge pull request #3 from trs-neilross/master

Release 3.0
first commit
third commit
Merge pull request #7 from trs-neilross/develop_neil2

Release 3.0
Merge pull request #8 from trs-neilross/develop_neil1

Release 3.0