Merge pull request #1 from talek/master