#38 - Get rid of the Thread.sleep() hack