• merging latest changes with addition of working commandline PR

    @transitive-bullshit
    transitive-bullshit committed May 12, 2014
    Loading status checks…
    25c9080