Merge branch 'tomaskovacik-master'