Version 0.2.1 - Properly scope all variables