First Commit
resolved little merging issue