Issue 7: 16.06.17

0