Added arithmetic test
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
style fix
Merge pull request #318 from CJentzsch/develop

Added arithmetic test