Add support for natty

Reimplementation of PR #19 to cleanup superfluous commits, and adjust to new
module structure.