Pull request for my issue patches

Here is a pull request for #58 #59 #60