Implemented Version and bugfixes