Merge pull request #6 from ramatevish/master

Merge in add_atexit