Merge pull request #19 from tomasherman/master

SBT failure fix