Initial Commit
Fixed minor bug