fixed time conflict issue closes #58
fixed time conflict issue closes #58

kryali/classwhole,mikesmayer/classwhole,mikesmayer/classwhole,kryali/classwhole,kryali/classwhole,mikesmayer/classwhole,mikesmayer/classwhole