Merge pull request #199 from slide/master