Header files fix
Merge branch 'master' into develop
R4Node fix.
Merge branch 'develop' of github.com:srdanrasic/R4 into develop