Bugfixes

- The bugfixes we worked on together in the evening of tuesday 09.12.2014 to create version 1.0.0
- The bugfixes i worken on in the evening of wednesday 10.12.2014 to create version 1.1.1