Closed ticket #6

Needs testing