Tiny fixes#2

Open

komita1981 wants to merge 2 commits intoajant:masterfrom

komita1981:master

Commits on Jul 23, 2015

Set default value
Milan Popovic
committed
Checking if element is array before going into loop
Milan Popovic
committed