small fixes and optimizations
Merge pull request #102 from udK/patch-1

small fixes and optimizations
missing files

Change-Id: I489641830acfa6ede0e17a2e61eaa70a471fb657