- updated wiki and instructions
Updated lock after merge with upstream