Update to 2.3.6
Merge pull request #118 from oneru/master

Update to 2.3.6