added support of travis-ci
switched to fenced code blocks
Merge branch 'develop'