Closes: #161, #162 Signed-off-by: Justin Georgi <justin.georgi@gmail.com> Reviewed-on: #164
Signed-off-by: Justin Georgi <justin.georgi@gmail.com>