Fixed the setIsFirstTime boolean
Merged master into tempmerge