so many changes, not even going to try
Merge pull request #3 from ansballard/master

so many changes, not even going to try