pr-16

This is an update for [pr-16](https://issues.liferay.com/browse/pr-16).<br><br>