Pull request for #24 and #25