Included missing files, made source 1.5 compatible
Merge remote-tracking branch 'origin/master'