- FEATURE: Add some Unit functions
Merge origin/master