Merge pull request #14 from indraneeldey/development

new changes with orig repo ahead