trabis - 2011-09-18

This will be addressed on future version