Merging issue 33
New item - fixes 28

closes #28
Merging 28