Merged 5/2/13 @ 4pm