Merge pull request #328 from 3tilley/atexit-fix

Atexit fix