Bug fixes

Fixes issue #55 
Why are you copying these to our app? They're already available from the gem.