Changes for tickets VIX-162 and VIX-175
Merge pull request #1 from eberletj/Test

Changes for tickets VIX-162 and VIX-175