optimize existing code, update to version 1.0.3