#17 fix for unresolved merge

unresolved conflict committed at fbf3c03