Alpha 2.2

Contains various bugfixes and a small addition (master configuration
file)