Fixed matching problem for not well formed input lines.
Merge branch 'master' of https://github.com/stratosphere/stratosphere-summit