neolao Merge pull request #7 from lucatarik/testing