merging yurayko branch