added Pythonic syntactic sugar
Merge branch 'develop' into rate