Some vanilla support added to dimensions
Merge remote-tracking branch 'origin/master'