Fixed #94 warnings, how why??
Merge branch '94_Warns'