Dir2 commit
Merge branch 'master' of github.com:sherrylc/sherryl