james | added functools wraps for better logging and stacktraces
james | consistent naming
Merge pull request #127 from jcourtois/friday_mar_21

james | added functools wraps for better stacktraces