Merge pull request #151 from Tucos/ws-hist