Fixed setStore functionality. Removed TODO
Merge pull request #44 from Jero786/FIX_SET_STORE

Fixed setStore functionality. Removed TODO