bug fixes
Merge branch 'master' of https://github.com/nirdothan/plabproj.git