fix for #554 and #552
Merge remote-tracking branch 'upstream/master'
Merge pull request #556 from bradrydzewski/master

fix for #554 and #552