Merge pull request #8 from ddaf/master

Fixed seek, improved its implementation and cleaned up, kudos to @ddaf.