2bef6d8 Merge pull request #47 from tudalex/master