Merge pull request #96 from Blackchai/master

Fixed issue with editing assignments.
Fix for Edit Assignments encodedValue
Merge pull request #97 from hhoang/master

Fix for Edit Assignments encodedValue