Merge pull request #1 from bancer/master

Update
radu version
Merge pull request #2 from kapparulz/master

merge with radu
conflicts handled