Updates as stated in PR#20 comments.