Merge remote-tracking branch 'upstream/integration' into umlversion

* upstream/integration:
fix
Merge pull request #113 from nikolalazovski/umlversion

Umlversion