Funord

Fix for #24.