Issue #18: Solves issue #18 

https://github.com/open-classifieds/common/issues/18