Trying to commit from eclipse
Merge branch 'sinius15/master'