manually merged with fabian Vollmer
.class files added
gir rm -r *.orig