Store specify

Issue 65 & 66. Also bug with double store fixed.