Merge pull request #1 from gooofy/master