Merge #23 fix