Added cleanup code
Merge branch 'master' of github.com:mackorone/iwbtg