Manual boxing edited
Merge pull request #14 from jayarbautista/dev_12.0

Manual boxing edited