improvements galore
Merge branch 'master' of github.com:JonathanRaiman/Iguana