Merge pull request #1 from tarlepp/master

Update