Merge branch 'floatbranch'
Merge remote-tracking branch 'upstream/master'
Added new contains function.
Fixed conflict.
Merge pull request #4 from niklasborwell/master

Added new contains function.