Bumped version to 0.7.9
Fixed a bug in the previous fix
Merge branch 'dev'