Merge branch 'master' of https://github.com/BinPy/BinPy
Merge branch 'master' of https://github.com/BinPy/BinPy
Merge branch 'develop'
Merge branch 'develop' of https://github.com/BinPy/BinPy
Merge pull request #220 from BinPy/develop

Merge develop into master v0.3.1
Merge pull request #222 from BinPy/develop

Make PyQt4 soft dependency
Merge branch 'develop' of https://github.com/BinPy/BinPy into develop
Merge pull request #230 from BinPy/develop

Updating master
Merge remote-tracking branch 'upstream/master' into develop
Merge remote-tracking branch 'upstream/develop' into develop
PEP8 fixes
Merge branch 'pep8-fix' of https://github.com/debugger22/BinPy into debugger22-pep8-fix
updateConnections Fixed
Merge pull request #5 from salil93/debugger22-pep8-fix

Bug fix in DEMUX by salil93
Remove whitespace
Correct Exception syntax
Merge pull request #238 from debugger22/pep8-fix

Fix Build Error