fixed data class
Merge origin/master