Fixed issue #48
Merge branch '0.9.4' into 0.9.5
Resolve issue #39, exp, squad and intermediate functions
Merge branch '0.9.4' into 0.9.5