resolves #37, and fixes build