Apply changes suggested by Araq

Added documentation examples, added defaults