merge updates from mistcore #1