Version 0.002 - Added MainHandler