Merge pull request #12 from rodo/master