Organizing some code
Batman will protect our code!
Merge pull request #1 from andreagrandi/master

Batman will protect our code!
Some code refactoring
Merge with agrandi
Merge pull request #1 from astagi/master

Organizing some code