Merge pull request #18 from brianshumate/master

Some updates and haiku
fixed tabs
fixed tabs
fixed tabs
fixed tabs