pushing changes from level1 and sranim_ing2

Signed-off-by: Mchapuis <machapu@gmail.com>
Merge pull request #49 from Mchapuis/master

fxjg