Fix a decorator to work with tests
Bumped version number
Merge branch 'release/0.7.4' into develop