Merge pull request #6 from seivan/develop

Merge pull request #5 from seivan/master
Merge branch 'release/1.1'
Merge branch 'master' of github.com:seivan/ScalarArithmetic
Merge branch 'master' into develop