updated version; included rantav's pull request