RMI Branch 1

Merging first changes