Added support for resolving magic constants and completed tests. Resolves #5 and #6.
Merge branch 'magic-constants'