Updating latest round of bug fixes
Merge branch 'master' of github.com:youngrewiredstate/pyrosite