Added Rakefile
Stuff
Some Bugfixes