Cleaned code a little
New main is coming up
New release also added to configure.ac and CMakeLists.txt