Add Unit Tests and made final changes for v1.0.