Merge pull request #97 from RiteshMaheshwari/master

bug fix issue #95
big fix for #62