Fix errors
Merge branch 'master' of https://github.com/2014-1/001