Merge pull request #260 from ragerdl/master

6 CLs