Fix for PEP8 and Builder fix
Merge pull request #2 from berkantaydin/master

Fix for PEP8 and Builder fix