Merge pull request #3 from ricardojmendez/master

Multiple changes and improvements