Issue #225 fixed routing issues and documentation issues

@rami-khalil  @mohamedsaeed93 @fadel1493  @Sharaf93  @mimikian  Can you please review my code. Thank you.