Merge pull request #112 from waymirec/master

UP-3645