Update SBT file
Merge remote-tracking branch 'origin/master'
Improve parser a little bit