start issues #70 and #59
Merge remote-tracking branch 'origin/master'