Initial revision
Added more methods
Changed sample code