Merge pull request #137 from ivangrimaldi/master

Changed assembly lifecycle mapping and other minor fixes
Merged changes from marcoNieddu/jemma