new pull request

pull request to fix #4 and fix #25