Merged changes from marcoNieddu/jemma