Merge pull request #23 from petevg/bug/instance-placement-bug