Merge pull request #87 from guorbit/staging

Update main to contain new release code

Merge pull request #60 from guorbit/staging

Merge pull request #59 from guorbit/development