Bugdate
Merge branch 'master' of github.com:sjjh/guidev2