Do better directive checking
Add myself as the author
Make this work on python3