Bug fix; websharks/quick-cache#184
Bug fix; websharks/quick-cache#185
Merge branch 'feature/184' into feature/188
Bug fix; websharks/quick-cache#188
Merge branch 'bugfix/188' into release/140529
Merge branch 'release/140529' into 000000-dev