Merge branch 'issue-18'
Fixed link
Updated CHANGES for release
Fixed CHANGES from last merge
Merge branch 'master' into develop