Fixed build; fixed out-of-bound test cases
Merge pull request #100 from rkskvk/develop

Develop