master merge from hangum