Some work
More work. Reached an acceptable quality stage.
Merge pull request #2 from Ribesg/dev

Merge development branch into master