Initial commit.
Merge remote-tracking branch 'fskreuz/master'