Update to master

Should fix everything.

Closes #28