setarcos Merge pull request #22 from ermito/master