Merge pull request #142 from akashjain132/akash/final_new_style