Merge pull request #14 from osscca/master

Minor adjustments