Upgrade to rails branch

last pull did not work, 0.3.0 still does not have the code of the rails branch, so please give it another try :)