Made critical improvements, too many to explain
Merge pull request #1 from iiAtlas/master

I'll humor you.