Merge pull request #79 from smsm1/improve_presets