Fixed small stuff for svn
Merge branch 'hotfix/1.0.2'