Initial update
Initial update and bug fix