applied changes by Sebastian Hengst (Archaeopteryx [:aryx])