SPR-10309
Merge pull request #44 from dpredovic/master

# By Dejan Predovic
* pull44:
  SPR-10309