Changes made, in order to fix some problems reported in the Assembla ticket #7 and #57.