Improved documentation + fixed merged code (#52)