affects issues #68 and #69
Merge branch 'master' into floatRecords
Merge branch 'master' into floatRecords
closes #69