Attempt at #314 (=100*pi)
Merge branch 'master' of https://github.com/nilmtk/nilmtk