created bracnh 'smidt'
Merge branch 'smidt'
Merge branch 'master' of https://github.com/Smitche/systime-prototype