Merge pull request #81 from smsm1/improve_presets