Added resources and minor changes
Merging issue-83 into develop