removed copy/paste errors. removed wrong empty checks
Merge branch 'devArmin'