Merge pull request #4 from mlund/master

merge with mikael
GrandCanonical rework
Merge pull request #61 from LukasSukenik/master

GrandCanonical fix