replace $
frank's project
solve problem
Merge commit '7f9dfa86f20d168f81c71b16eac057ef24ab22a3'
change on master