close #222
Merge pull request #249 from bortevik/master

close #222