Merge pull request #1 from intrd/master

merge changes from master