Merge pull request #17 from djipi/release/R4