Fixes for sunpy tweaks
Merge pull request #4 from Cadair/master

Fixes for sunpy tweaks