Merge branch 'master' of github.com:watchsky/calculator
Merge branch 'master' of github.com:watchsky/calculator