Updated the placement logic

It should be much better now and less prone to insisting
nothing more could be placed when they could
Merge branch 'master' into gh-pages