Merge branch 'master' into dev
format for thesis build

Signed-off-by: Erik Bernoth <erik.bernoth@gmail.com>
FIX: pip install bug

Signed-off-by: Erik Bernoth <erik.bernoth@gmail.com>