Implemented quick fix for Issue #14
Fixed incorrect issue URL
Updated copyright
Merge branch 'master' into issue-17