Merge conflict
Merge branch 'NashFSharp-master'