Some minor improvements & updated documentation