Merge Yuhta's branch