rev 14gen2014
Merge pull request #1 from grammaton/master

rev 14gen2014