Improved methods
Merge pull request #2 from CurveBeryl/master

Improved methods