Merge pull request #210 from adrianis86/master

RO update
Merge pull request #211 from adrianis86/master

RO update
Merge pull request #36 from DvTonder/master

merge