Merge pull request #1 from rm/master

Fixes for Eclipse
Merge branch 'greenTara'