Phriction - removed width restrictions
Merge branch 'master' into modifications