Merge pull request #4 from robinmalburn/dev

Added better handling of rerunning init.  Added self render support
Merge branch 'master' into dev
General improvements and more accurate colour mapping