Code Refactoring. Some fixes. Updated to 0.0.3