Version3

Fixes #20 
Fixes #15 
AMEN! Seems like such a dumb thing, but it's really useful.