Merge pull request #1 from prife/master