Merge pull request #3 from villagedefrance/master

Merge Master to Branch v1.6.1 - pre-release
Merge pull request #4 from villagedefrance/Overclocked-v1.6.1

Merge pull request #3 from villagedefrance/master