Merge #28 fix to master