Merge fix.

Signed-off-by: katlogic <kat@lua.cz>
Merge fix #4.

Signed-off-by: katlogic <kat@lua.cz>
Add rivets.js support.

Signed-off-by: katlogic <kat@lua.cz>