2.1.1 READY
Merge pull request #50 from macedorl/master

2.1.1 Ready