Addressing Albert's comments for Pull request #144. Fixed a small bug and changed certain module object name to the full library name.