Merge pull request #1 from ducksmanager/master

ducksmanager's changes