Minor code changes & added mac project