updated v2014
Merge pull request #1 from eyespike/v2014

updated v2014