Few code modifications, add __author__ and __date__