#81 Implemented
#81 Adding missing files