Bugs Fixed 2
Merge remote-tracking branch 'origin/master'
Times Changed - Last pop up fixed