U5A1 fixed
U5A1 & U6A2
Merge branch 'refactoring-U5A1'
Merge branch 'master' of https://github.com/vampaynani/oda