Forgot to commit the changed files :). Should now close #20.