Merge pull request #26 from andrewjpage/master

namespace for parsing input files in sspace