Added static modifiers.
Merge branch 'master' of github.com:Codingbean/Macaw

Conflicts:
	macaw.php