Merge PR #14 from @giuliano