Avoided <> operator as compiler doesn't like it. (not Java 6 friendly)
Merge remote-tracking branch 'origin/master'