Added some methods
Merge branch 'development'