Updated with context demo and documentation. #18