Gozala Merge pull request #52 from jimmywarting/master