Fixed ImportError caused by #108 and #109