madrobby Merge pull request #178 from Nouzbe/master