bug #651 - write tests for all functional, change imports
bug #651 - change imports
Merge pull request #2 from rgatkowski/bug_651

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