#1 recreated problem
#1 added handling of versions
#1 fixes after review
Merge pull request #8 from krzyk/1

#8: pull request #1 recognizing versions