Merge pull request #4 from nikolayd/master

3