Chages stuffs
Fixed stuffs
Merge branch 'master' into growl

Conflicts:
	example.php