holub008 merging recent changes