Revision Two: June 5, 2013

This commit is based off of the 6/5/2013 ~1800hrs commit of Mateusz
Ryczek to leMateusz.