Merge branch '#20'
#23
Merge pull request #31 from marek-surek/master

#23 - spring version update