r6 devel started
Merge pull request #43 from rctoris/devel

r6 devel started