Merge "refactor Dictionary class." into devel/master