#95 fixes
 #95 fix
 #95 fix
Merge remote-tracking branch 'github/master'