Merge pull request #622 from killabytenow/master