force lock install
some little bug fixes
Merge pull request #10 from codeboard/develop

Develop