Closed ticket #5

Needs Testing