Fix for #53
Added more files to issue 53
Merge branch 'master' into iss53