magic number modification 2
Merge remote-tracking branch 'upstream/master' into vojt
Merge pull request #2 from vojtak/vojt

vojtak --- magic number modification 3 - automerge