Merge branch 'master', remote-tracking branch 'upstream/master'
Added support for magic constants
Merge pull request #2 from sorinsarca/master

Added support for magic constants, improved parser