Final dev version - tests work via pycharm - reqady for virtualenv testing.