#25

This PR merges with master and fixes #25.