closes#1 This commit should close Assembla Ticket#1