added Pot
put in some error handling and documentation
Merge branch 'pot' into develop