stash
Merge pull request #92 from saulelis/bugz3

stash