Fix imports for issue #19
merge