updated as per pull request#19