APR 1.5.1

Closes #304.
Closes #306.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>