merge monster with tfs

Merge monster with tfs master branch.