Merge pull request #276 from safonovra/master

LGTM, Add user rsafonov