294aa50 Merge pull request #20 from iulianR/master