added stop to bottom of files
added stop to bottom of files
added stop to bottom of files
Merge origin/master