html+
better options/settings handling, ratio height fix
Merge branch 'master' into bootstrap