*Solved bugs 12 and 16 and committed.
 *Updated CR https://codereview.appspot.com/11584044/