Support for numbers on assignments
Merge branch 'assignments'