Fixed all warnings in 2014 update
Merge pull request #4 from calcmogul/master

Fixed all warnings in 2014 update