Added units definition to STS file.
Merge remote-tracking branch 'origin/master'