typo
Merge pull request #47 from sbillard/master

object changes mostly
Merge pull request #48 from sbillard/master

search replace gone wrong
Merge pull request #49 from sbillard/master

more compatibility
RC5 version
Merge pull request #50 from sbillard/master

changes from testing 6/30
Merge remote-tracking branch 'upstream/master'