Some changes bug still needs debugging
Changes
Merge pull request #3 from cwhite911/master

Updates