Fixed Issue#19 add machine at index