v.0.1.1

Changed class- and variablenames.