Ravbug Merge pull request #35 from henriquecolini/master