first commit

first version from old system
Merge origin/master