Version v0.5

This version have been tested using unit testing. Working version.
Unit Testing v1.1

Slight amendments to the tests to match the v0.5