- add some more conditions when load css files (fixes #81)
Merge branch 'issue#81' into dev