Merge pull request #1 from coyotte508/master

forwarding changes
Merge remote-tracking branch 'po/master'