Fixed demos and phpdocs