Some last minute fixes!
Merge branch 'dev' of github.com:tidyui/Piranha into dev