Merge pull request #4 from h0x91b/master

Storage implementation