Signed-off-by: Piotr Raczynski <pio.raczynski@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.c

Signed-off-by: Piotr Raczynski <pio.raczynski@gmail.com>