Squashed commit of the following:

commit 74065801b73c98fea8bd21b73119765dafb130af
Author: Edyta Strzebonska <strzebonska.edyta@gmail.com>
Date:   Tue Apr 22 11:42:19 2014 +0200

    Fixes #6

commit 94c6aa47cbdd071764d14d6e127bf40986eca636
Author: Edyta Strzebonska <strzebonska.edyta@gmail.com>
Date:   Tue Apr 22 11:39:34 2014 +0200

    Fixes #6

commit 4fee0b60ea4070e31dc6fb07cdca7bf6b80a2c44
Author: Edyta Strzebonska <strzebonska.edyta@gmail.com>
Date:   Tue Apr 22 11:38:55 2014 +0200

    Prace nad #6
Fixes #6
Fixes #6
Merge branch 'develop'