updated classes
updated modules
Merge pull request #27 from vijinho/1.0-dev

1.0 dev