routing and minor changes
resolving conflicts and merging issue 101 develop