cispy's functions
Merge pull request #11 from JackStat/master

merge
Merge pull request #17 from dcaff/master

merging 3