pull-request-136

Hey @Mat-Longinow,

Attached is an update for http://issues.liferay.com/browse/pull-request-136.

Please let me know if you have any questions.  Thanks!