added pragmas and rearranged methods
Merge pull request #63 from amychiu/amy/development2

added pragmas and rearranged methods