Added basic assignment
Added basic assignment
Merge branch 'master' into manning