Fixes: #26 and #25