Merge pull request #18 from djipi/release/R4