final submitt for A2.
Merge pull request #84 from phfanelli/master

final submitt for A2.