Final Update

Update with test code removed
Merge pull request #69 from Lgpassions/patch-8

Final Update