Merge pull request #7 from jcard/master

Undo/Redo functionality
Minor Cleaning