Merge pull request #3 from crian/master