Merge pull request #18 from gryffon/master

Bring up to date with master
Merge pull request #27 from gryffon/documentation

Merge pull request #18 from gryffon/master