fix #2
improve code