some small things
Merge branch 'sinius15/master'
Merge branch 'sinius15/master'