merged current development status into trunk