FlaPer87/meclipse — pull request #7 by philnate (2012-04-13 07:27:26+00:00)
Title: Latest changes from takezoe and NPE fix

Hi please pull those changes done by takezoe and me.