v0.25 includes functions
Merge branch 'master' of https://github.com/nh100/Ispy

Merging changes