Merge pull request #3 from prmtl/master