Merge pull request #17 from Juniper/chandan_bug_1354581

bug fix for bugs 1355006, 1354579, 1354581, 1355712, 1354579
fix for bug 1354579