1.3.6
Merge pull request #30 from bc-oscar/master

1.3.6