caching works!
Version upgraded
Code reformated