Merge change from storymaker

This is to keep track of master branch of story maker.