Merge pull request #59 from MBQ-/patch-1

Minor changes