idoaflalo

Results 2 issues of idoaflalo

Please merge our changes from develop branch :)