Merge pull request #2 from alejocosmico/master

reorganization
Merge remote-tracking branch 'upstream/master'