Build number uniqueness

Fix for #120, please see commits descriptions for more info.