Fix imports and docopt usage
Merge remote-tracking branch 'origin/release' into alpha
Merge release branch, fixes for issues 13 and 14