Implemented InputParser
Merge origin/master