Fixed lint issues.
Fixed Travis-CI tag. relates to issue #20.
Merge branch 'develop'
relates to issue #39.