Merge changes from NHan clone