testing gh-pages
small changes
merged with master