Cleaned up warnings.
Merge
Merge pull request #4 from phoenixria/master

Cleaned up code warnings