Completely Updated - Several New Methods and Bug Fixes