Merge pull request #6 from h0tw1r3/v0.97-series