Merge pull request #1 from binux/master

pull