+ https://jirap.corp.ebay.com/browse/POLYGLOT-337
Merge pull request #29 from inexplicable/master

+ https://jirap.corp.ebay.com/browse/POLYGLOT-337