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