java 1.5 (for generics)
Merge branch 'hotfix/0.1'