Conform to code style guidelines

Update #95
Add a new rule in code style guidelines
Formate CONTRIBUTING file
Update thanks file
merge master and fix conflicts