@bf4 updates

Includes #27 and #28