Merge pull request #26 from blocktrail/magic_byte

Magic Byte
Merge pull request #27 from blocktrail/psr2alltheway

Making the codebase PSR2