clean up, and add posible feature
Merge pull request #2 from EleDiaz/master

Clean up.