minor fixes
bug fixes
minor
closes #2
closes #3
copyright; ack
copyright
doco
Merge remote-tracking branch 'upstream/master'
further changes for PR#1