allow for mixin
added support for void tags
Merge pull request #1 from logaan/master

Merge code from mainstream.