Merge pull request #7 from uipo/master

Adding tests and some upated files