SPR-10125
Merge pull request #42 from dyk/master

# By Przemek Dyk
# Via Przemek Dyk
* pull42:
  SPR-10125