Merge pull request #67 from gege-alina/radumvlad

#fixing live
 #65 still unfinished - but really near
Merge pull request #68 from gege-alina/somemod

 #65 still unfinished - but really near