Rev 0.0.4

Added Handler, and cleaned up few compilation errors