updated imports as per #46
updated imports as per #46