Fix for issue #53. Thanks Dennis!
Fix for issue #52. Thanks Dennis!
Fix for issue 51. Thanks Dennis!