final updates
Merge pull request #17 from pannunzio/abacate

final updates