771-bugfix
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from nbogol/771-bugfux

771 bugfux