Nagyrobi

Merging changes originally requested by @nagyrobi in issue #72