merged #232; Added samccone  fixes