Merge pull request #180 from nekromant/info