done
Merge pull request #29 from mer567/master

Pull request.