fix #88
Merge branch 'master' into dev
initial for themes