Merge branch 'master' into devel
Minor cleanup.
Fixed #26, fixed #36
Merge branch 'issue26' into devel
Bumping to 0.1.7
Merge branch 'devel'