pr-21

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