Merge pull request #9 from dret/master