Fixes #35

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

Fixes #35