fix issue #15

Fixes #15 

Sorry for the delay in submitting this @jamztang !