Some changes relative issue #11