Adding in int and natural

Fixes #17
Fixes #16