Merge pull request #145 from davidlibrera/1-3-stable

1 3 stable