Merge pull request #1 from JacORB/master

Synchronize with master
Merge pull request #62 from pmesnier/master

mastersync