Unify notation
Merge pull request #89 from crazymaster/notation

Unify notation