Eclipse refactor.
Merge pull request #1 from Bytecrawl/develop

Eclipse refactor.