Added textbox... button is pending
Finished issue60
Merge branch 'issue60'