Done :) (updated this pull request)