various fixes and additions
various fixes and additions
Merge branch 'master' of github.com:e2themillions/AnnotationCanvas