merging to master

first working version.