Nilavu fixes 26, 27, 28
Merge pull request #29 from thomasalrin/master

Nilavu fixes 26, 27, 28