first commit

@only2shirish 
First commit after solve all issues