Merge pull request #12 from DvTonder/master

merge
Merge pull request #13 from DvTonder/master

merge
RO update

daydream
Merge pull request #113 from adrianis86/master

RO update