More Clean Up + Closes #11 & Closes #12
Merge pull request #4 from EOL-Labs/master

upstream pull