Initial commit
Fix bug1