Implemented PullRequest by #51 by @Zarroc1991