removed typo and corrected notation
Merge branch 'dev'