Added pull request #43 in order to use it on my local machine until it is accepted or better alternative is in place