version 3

Late committed, moved from Dropbox to Github