Fixed issue #18

I have also followed the suggestions "remove wild import" ...