Janczo & Tymek + code format
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from Vixu/master

Additional people