Title of the pull request

Merge Master branch and side1-for-trying-eclipse branch