zupka
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vergilius
Merge pull request #18 from elberth90/master

zupka