More items from 10.2/10.3
small fix
Merge pull request #404 from ninjahopparn/master

More items from 10.2/10.3