Updated to 3.6.
Merge pull request #43 from alaframboise/master

Updated to 3.6.