Dropped down language level to 1.6
Merge branch 'v1'