Added no-cache
Resolved bug #61
Resolved conflict