Merge Request into development

!12 (merged)

Thanks.

CC: @andymaks