commit to github v0.1-alpha
Merge branches 'dev' and 'master'