bug fix and missing ";"
Merge branch 'bitmap_skin' into development