Initial Import
Merge https://github.com/martinstefany/mss.local