Applying changes from RCast 306
Merge github init and master