major update
Merge pull request #3 from Colton/master

Major Update and Tune-up! Thanks @Colton.