Merge pull request #14 from yasek/master

API improvements.
reverts stylistic changes; fixes from modname import * to more
appropriate style
reverts stylistic edits
Merge pull request #1 from heni/master

revert stylistic changes