Merge Commit
Added basic hit detection