Merge pull request #1 from rocwind/dev

add new content in dev branch