changes for issues 153 and 158

https://github.com/restlet/restlet-marketing/issues/158
https://github.com/restlet/restlet-marketing/issues/153