Merge pull request #19 from aasaru/kengneruphine_develop_fixed