Reviewed changes from #ab2c58a

All changes were already included. Made a minor edit.
Merge pull request #59 from guillermooo/old-edits-ported

Reviewed changes from #ab2c58a