Minor cleanup. fixed issue #8.