This pull request contains fix for Issue#33 and Issue #35  Ash/13w43 fixes

Fixed Issue #33 , Issue #35  for  13w43-fixes ,
review and merge this .