Merge pull request #6 from ascorbic/master

Update to 0.3.36