Develop merge

Merging develop.
Changes.
Removed Stub.scala