added a commit from iss53
merge from master
merge from iss53
Merged master and iss53
default nano editro