make BaseDirection, Direction
make BaseDirection, Direction
Merge remote-tracking branch 'origin/master'