commit of v1.0.1 - add decorators and error handling