pushing so I can merge
Merging from master
Merge remote-tracking branch 'upstream/master'
Integrated offline functions but not tested
Fixed the crashes
Merge pull request #351 from iameric1986/master

Fixed the crash