.-.
Merge pull request #14 from wal31cr/Pablo07

pablo to masta .-.
Merge pull request #15 from wal31cr/master

masta to wal31cr