fixed annotation
merging master to gh-pages
committing from travis!