--worked on bitbucket issue #39