fix
Merge pull request #6 from davidmccoy/develop

Changes for Master
Spring Fix
Resolving merge issues with develop branch
fixes spec problem
Closing Spring fix error