Added changes to Maekfiles
Merge remote-tracking branch 'origin/sw.nohom.act' into sw.nohom.act