initial commit
Merge https://github.com/erupter/saettanetus