Merge pull request #6 from ramatevish/master

Merge in add_atexit
Merge pull request #7 from ramatevish/add_atexit

Merge pull request #6 from ramatevish/master