changed travis badge image to master branch
readme adjustment
master merge
some rebasing