Merge pull request #38 from Zomega/master

Cleanup and relevant bugs.
Merge pull request #40 from Zomega/master

Adds /lightweight/
Merge pull request #41 from Zomega/master

Make Lightweight Version actually lightweight!