Merge pull request #1 from cmosetick/master

merge changes from cmosetick/Docker-RRO