Revert "Code merge v1.7.9"
Merge pull request #8 from thomascool/revert-7-code_merge_v1.7.9

Revert "Code merge v1.7.9"