some bug fixes
Merge branch 'master' of https://github.com/Para-dox/OPDB.git