trying to solve the bug #18
Merge
Update Gems
Version bump to 1.2.2
Bump version
Merge remote-tracking branch 'upstream/master'