Small changes + documentation changes, including document MD template
merge from master
Merged changes with master