Feature/merge back 0.2.0

Merging Release 0.2.1 Back to develop