Creation of spacecowboys package
Merge origin/master