Merge pull request #4 from Blackrush/master