make changes from https://github.com/eteplyakov/android_labs_rw/pull/5
http://redmine.ruswizards.com:8100/redmine/issues/13994