partial fix for issue 90
Merge remote-tracking branch 'origin/master'