Merge pull request #1 from freddy-realirm/maste