Pull request 40

Can you make the changes Brian describes here:

https://github.com/brianchandotcom/liferay-plugins/pull/2403