#30
#22
Merge pull request #41 from lsentkiewicz/master

#30 #22