Fixes #37

Signed-off-by: Madhu Venugopal <madhu@socketplane.io>
Fixes #33

Signed-off-by: Madhu Venugopal <madhu@socketplane.io>
Merge pull request #38 from mavenugo/master

Fixes #37 and #33