first commit
Merge git://github.com/indolering/train