add line 2
add line 2a
add line 2ax
new feature 1-1
add line 1-2
fixed minor bug.
merged development
finished issue 01