merged from sub-module - removed ~ file and added comments
merged from sub-module - removed ~ file and added comments