Merge pull request #9 from Juniper/meghb_missedcommits

Patch in dfc7f80 and  a55da8b
Merge pull request #10 from Juniper/meghb_missedcommits

Patch in: e9572f3e8e78ca5ce44b7e0ec84568dea97adb8c