breaking
fixing various stuff
Merge pull request #5 from Caveat4U/backup

Backup