LRA-192 : Point 1, 5, 7 are fixed
Merge pull request #11 from cjimenez2581/master

LRA-192 : Point 1, 5, 7 are fixed