Merge pull request #122 from Bigpoint/next

CSV-2014-0243
Merge pull request #123 from Bigpoint/master

Merge pull request #122 from Bigpoint/next