Stupid branches... not remerging.
Merge pull request #2 from atelierabbey/master

Stupid branches... not remerging.