added test case
Merge branch 'alabo' into develop
ruby 18 fixes
Merge branch 'strip_punctuation_ruby18' into develop
Merge branch 'develop'