Firt submission 01/06/14
Merge branch 'master' of github.com:danielfsc/dia