Switching from spork to spring - fixed #64