routing and minor changes
Merging issue-92 into develop and resolving conflicts