Initial commit
Minor Bug Fix