fix #19
Merge pull request #29 from CiscoSystems/issue19

fix #19 fix #18