Issue #24: fixed missing modules and added import shim for running under Python < 2.7