#35, updated documentation