Merge pull request #1 from grammaton/master

New segsweep
Merge pull request #2 from Paxxx/master

Merge pull request #1 from grammaton/master