I added new pull request as this branch was merged with this change.
I think it is wise to wait for travis to compile before merging ;)