Merged eclipse project. Fixed issues and better code