Merge pull request #8 from trs-neilross/develop_neil1

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

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

Release 3.0