Merge pull request #18 from gryffon/master

Bring up to date with master