Commit1

Some small changes - tested with ubuntu 12.04 64bit