Merge pull request #31 from mondora/master

Update.
Merge pull request #32 from mondora/APP-387

Merge pull request #31 from mondora/master