Merge in pull request from wess
Update copyright dates
Update Copyright Dates
Merge in changes per issue #34
merge branch development