Refactored to improve code climate rating
Refactored to improve code climate rating
Updated readme
1.0.18 CHANGELOG
Merge branch 'release/1.0.18'