begin rescue on paramter selection
Merge branch 'dev'