Made history less complex and less bug prone
Version upped
Merge pull request #14 from Imperatus/develop

Develop