Fixes #35

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

Fixes #35