Merge pull request #1 from AdrianTM/master

latest changes that kmathern made
Merge pull request #1 from anticapitalista/master

Merge pull request #1 from AdrianTM/master