Master branch update

* Update from live kisakone codebase to master.