Some changes regarding to the assembla tickets: #70 and #77.