bug #650 - remove spaces to be compatible with pep8
bug #651 - write tests for all functional, change imports
Merge pull request #1 from rgatkowski/bug_650

bug #650 - remove spaces to be compatible with pep8
buildout support
bug #651 - change imports
Merge pull request #2 from rgatkowski/bug_651

bug #651 - write tests for all functional, change imports