max not hard coded
Merge branch 'dev'