Merge pull request #1 from huit/master

Merge v1.5.0
Merge remote-tracking branch 'upstream/master'
Updating documentation. Fixes #31
Merge pull request #32 from robruma/master

Updating documentation. Fixes #31