ready, but needs documentation
Added POD
Merge branches 'master' and 'refactor'