Eclipse kick start
Merge remote-tracking branch 'master'