Final Fixups
Merge pull request #14 from Etheras/master

Final Fixups