19.12.2013  Add eclipse support, merge changes