pull request #2 from slav/master