add 1.2
add davids stuff
Merge pull request #2 from clauniel/master

add 1.2 and 2