Merge pull request #7 from bc-oscar/master

Release 1.2.17
Release 1.2.18