Version 1.0 finished with test module