Merge pull request #1 from night/master

get all of the changes