Fixed #51 (thanks!)