Merge pull request #1263 from ismailsunni/version-2_1_1

Version 2 1 1
Merge remote-tracking branch 'origin/master' into travis