updated with more requirement
Merge branch 'master' of github.com:superbay/knowledge