Merge in changes for Issues 12, 13, and 14