major overhaul
Merge pull request #5 from thoney/unify

major overhaul