Bugs fixed
Fixed coding styles
Merge pull request #10 from magarzon/master

Bugs fixed and some modifications required for new features in Core