Merge pull request #36 from natech/master

Fixed CSS classnames conflict
Merge remote-tracking branch 'upstream/master'