Ash/13w45 fixes : fixes for Issue #47  Issue #49  Issue #50  Issue #51  Issue #52 

This Pull request contains fixes for below listed issues of 13w45

Issue #47 
Issue #49 
Issue #50 
Issue #51 
Issue #52