Issue #41 #97 new branch 

Issue #41 #97 
@muhammedabuali please code review this is as clean of branch as it gets