initial commit
Merge github.com:marek1/s2m