small pep8 fixes
Fixes #74: fix data expansion bug
Merge pull request #94 from denibertovic/fix_expansion

Fix expansions