merge from master
Merge origin/master
Trying to clean this up...looks like more merge issues.
Merge pull request #176 from dshurt/master

Master