Added statustype
Merge branch 'master' into alexbranch
fixed merge conflicts