abrisse Merge pull request #23 from abrisse/master …