Consolidating @paulweichhart's changes
Merge branch 'master' of github.com:annotorious/annotorious