Staging

Merging staging commits  #16 from me and ChefJerome