wow, really dumbell mistake. fixing issue #70
Merge branch 'master' into files