Changed from argument list to replacements map
Merge branch 'master' of https://github.com/lyncode/choiceproperty