Merge pull request #12 from uipo/master

Test-files back :)
Small changes