Merging from vslinko:master