Merge pull request #13 from osscca/master

A few small adjustments