Fixes #14 Thanks @vohedge!