Setbound to Subclases
Merge origin/master