Merge pull request #96 from gslender/master

Correcting history and reverting a previous commit