Merge pull request #1 from zrocweb/master

Update 0.6.1 from zrocweb
Why so much if??? lets re-factory
Make easy to ready !
DEV version 0.6.1
Merge pull request #1 from stutiguias/master

Pull from Stutuguias to zrocweb