Merge pull request #2 from schuay/watchpoints