bug fixes
Merge branch 'master' of https://github.com/ovid-nis/Project361