added context-manager syntax
improved context-manager syntax