Incorporated Neamar's nitpicking comment, should be about ready to be merged