fixed the problem, issue123 resolved
merge conflict
Merge branch 'dev' into staging
hf101 commit