Merge pull request #1 from PBarmby/master

First attempted pull request
Merge pull request #2 from PBarmby/master

Many changes!
Merge branch 'master' of https://github.com/sophiathl/imagecube
Addding in Sophia's changes.

* 'master' of https://github.com/sophiathl/imagecube: