Moved in line with name
Bugfixes to pass unit tests
Version 1.0