Merge pull request #1 from anderslm/master

Remove instrumentation.
Started implementing the local storage
Merge branch 'master' of github.com:MartinForre/odin