Update public repository with recent changes
Merge pull request #3 from Tapjoy/update_1

Update public repository with recent changes