merged patham9's 5 last commits from yesterday to today