added files from mint15-e6410
Merge branch 'master' of https://github.com/jfreilich/S_M_S